From: kaf24@scramble.cl.cam.ac.uk Date: Sun, 13 Mar 2005 09:42:55 +0000 (+0000) Subject: bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~17857^2~26^2~5^2~1 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=7d1e0ea248e8773e3c73d932ab5a7ec5bd0dd035;p=xen.git bitkeeper revision 1.1236.28.2 (42340b1fxpFQd7KdettTA0qbWMD-rg) Manual merge. Signed-off-by: Keir Fraser --- diff --git a/xen/common/domain.c b/xen/common/domain.c index d906251b02..f20c2f6b10 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -172,7 +172,7 @@ void domain_shutdown(u8 reason) debugger_trap_immediate(); - if ( reason == 0 ) + if ( reason == SHUTDOWN_poweroff ) { printk("Domain 0 halted: halting machine.\n"); machine_halt(); @@ -184,6 +184,12 @@ void domain_shutdown(u8 reason) } } + if ( reason == SHUTDOWN_crash ) + { + domain_crash(); + BUG(); + } + d->shutdown_code = reason; set_bit(DF_SHUTDOWN, &d->d_flags); diff --git a/xen/include/public/io/domain_controller.h b/xen/include/public/io/domain_controller.h index b3220eee1c..ec9c1a642d 100644 --- a/xen/include/public/io/domain_controller.h +++ b/xen/include/public/io/domain_controller.h @@ -12,16 +12,6 @@ #include "ring.h" -/* - * Reason codes for SCHEDOP_shutdown. These are opaque to Xen but may be - * interpreted by control software to determine the appropriate action. These - * are only really advisories: the controller can actually do as it likes. - */ -#define SHUTDOWN_poweroff 0 /* Domain exited normally. Clean up and kill. */ -#define SHUTDOWN_reboot 1 /* Clean up, kill, and then restart. */ -#define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ - - /* * CONTROLLER MESSAGING INTERFACE. */